Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.12] Beat: Allow setting beat name in configuration (backport #12176) #12224

Merged
merged 3 commits into from
Dec 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

This is an automatic backport of pull request #12176 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Uses the beat name if set in the configuration file. Restores what
used to work on 7.x and perhaps prior to #9149 being introduced.

This undoes an unwanted breaking change that caused beat.name to be
ignored.

Signed-off-by: Marc Lopez Rubio <[email protected]>
Co-authored-by: kruskall <[email protected]>
(cherry picked from commit a56c605)
@mergify mergify bot requested a review from a team as a code owner December 14, 2023 02:04
@mergify mergify bot added the backport label Dec 14, 2023
@marclop marclop enabled auto-merge (squash) December 14, 2023 03:05
@carsonip
Copy link
Member

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

rebase

❌ Unable to rebase: user carsonip is unknown.

Please make sure carsonip has logged in Mergify dashboard.

@carsonip
Copy link
Member

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

rebase

❌ Unable to rebase: user carsonip is unknown.

Please make sure carsonip has logged in Mergify dashboard.

@kruskall
Copy link
Member

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

update

✅ Branch has been successfully updated

@kruskall
Copy link
Member

kruskall commented Dec 14, 2023

@Mergifyio update

Copy link
Contributor Author

mergify bot commented Dec 14, 2023

update

✅ Branch has been successfully updated

@mergify mergify bot merged commit f86688d into 8.12 Dec 14, 2023
13 checks passed
@mergify mergify bot deleted the mergify/bp/8.12/pr-12176 branch December 14, 2023 22:03
carsonip added a commit to carsonip/apm-server that referenced this pull request Feb 5, 2024
PR elastic#12176 changelog should be done in 8.12, not head. elastic#12224 backport is
causing conflicts.
carsonip added a commit that referenced this pull request Feb 5, 2024
PR #12176 changelog should be done in 8.12, not head. #12224 backport is
causing conflicts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants